From 0fd671aed59a441b7651d7222cbe4f9ba7a3daee Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 27 Feb 2002 00:24:11 +0000 Subject: [PATCH] Make sure Page_Up, Page_Down get those names, not Prior, Next. Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): Make sure Page_Up, Page_Down get those names, not Prior, Next. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/win32/gdkkeys-win32.c | 24 +++++++++++++++++------- gdk/x11/gdkkeys-x11.c | 12 ++++++++++++ 9 files changed, 78 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8940ffb0be..5943462795 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 26 19:16:28 2002 Owen Taylor + + * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): + * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): + Make sure Page_Up, Page_Down get those names, not Prior, + Next. + Tue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8940ffb0be..5943462795 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Tue Feb 26 19:16:28 2002 Owen Taylor + + * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): + * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): + Make sure Page_Up, Page_Down get those names, not Prior, + Next. + Tue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8940ffb0be..5943462795 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Feb 26 19:16:28 2002 Owen Taylor + + * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): + * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): + Make sure Page_Up, Page_Down get those names, not Prior, + Next. + Tue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8940ffb0be..5943462795 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Feb 26 19:16:28 2002 Owen Taylor + + * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): + * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): + Make sure Page_Up, Page_Down get those names, not Prior, + Next. + Tue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8940ffb0be..5943462795 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Feb 26 19:16:28 2002 Owen Taylor + + * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): + * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): + Make sure Page_Up, Page_Down get those names, not Prior, + Next. + Tue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8940ffb0be..5943462795 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Feb 26 19:16:28 2002 Owen Taylor + + * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): + * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): + Make sure Page_Up, Page_Down get those names, not Prior, + Next. + Tue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8940ffb0be..5943462795 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Feb 26 19:16:28 2002 Owen Taylor + + * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): + * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): + Make sure Page_Up, Page_Down get those names, not Prior, + Next. + Tue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c index 2eebe11dc9..30be9db06c 100644 --- a/gdk/win32/gdkkeys-win32.c +++ b/gdk/win32/gdkkeys-win32.c @@ -1836,8 +1836,8 @@ static struct gdk_key { { 0x00ff54, "Down" }, { 0x00ff55, "Page_Up" }, { 0x00ff55, "Prior" }, - { 0x00ff56, "Next" }, { 0x00ff56, "Page_Down" }, + { 0x00ff56, "Next" }, { 0x00ff57, "End" }, { 0x00ff58, "Begin" }, { 0x00ff60, "Select" }, @@ -1874,8 +1874,8 @@ static struct gdk_key { { 0x00ff99, "KP_Down" }, { 0x00ff9a, "KP_Page_Up" }, { 0x00ff9a, "KP_Prior" }, - { 0x00ff9b, "KP_Next" }, { 0x00ff9b, "KP_Page_Down" }, + { 0x00ff9b, "KP_Next" }, { 0x00ff9c, "KP_End" }, { 0x00ff9d, "KP_Begin" }, { 0x00ff9e, "KP_Insert" }, @@ -1963,12 +1963,22 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase) gchar* gdk_keyval_name (guint keyval) { - struct gdk_key *found = - bsearch (&keyval, gdk_keys_by_keyval, - GDK_NUM_KEYS, sizeof (struct gdk_key), - gdk_keys_keyval_compare); + struct gdk_key *found; + + found = bsearch (&keyval, gdk_keys_by_keyval, + GDK_NUM_KEYS, sizeof (struct gdk_key), + gdk_keys_keyval_compare); + if (found != NULL) - return (gchar *) found->name; + { + while (found > gdk_keys_by_keyval) + { + if ((found - 1)->keyval == keyval) + keyval--; + } + + return (gchar *) found->name; + } else return NULL; } diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 3d43d61ebf..9d2677b44b 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -860,6 +860,18 @@ gdk_keymap_translate_keyboard_state (GdkKeymap *keymap, gchar* gdk_keyval_name (guint keyval) { + switch (keyval) + { + case GDK_Page_Up: + return "Page_Up"; + case GDK_Page_Down: + return "Page_Down"; + case GDK_KP_Page_Up: + return "KP_Page_Up"; + case GDK_KP_Page_Down: + return "KP_Page_Down"; + } + return XKeysymToString (keyval); } -- 2.30.2